Merge with xen-ia64-unstable.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 11 Apr 2007 14:45:29 +0000 (15:45 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 11 Apr 2007 14:45:29 +0000 (15:45 +0100)

Trivial merge